* lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe4a1a956eb975ced1edab03a4c982876d945b83..ef267e9fa31fd9068827a908ab8981bf6038a853 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
+
        * simple.el (normal-erase-is-backspace-mode): Map kp-delete identically
        to `delete' (bug#16109).
 

diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index f605c2865c00cf80be8401ded83da98aa585e09b..3a2c44a8da69d86acc75d09add6ccb8828cbdaa5 100644 (file)
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -222,6 +222,7 @@ be printed along with the arguments in the trace."
   (lambda (body &rest args)
     (let ((trace-level (1+ trace-level))
           (trace-buffer (get-buffer-create buffer))
+          (deactivate-mark nil)         ;Protect deactivate-mark.
           (ctx (funcall context)))
       (unless inhibit-trace
         (with-current-buffer trace-buffer